styleproperty: Remove context arg from _gtk_style_context_query()

diff --git a/gtk/gtkborderimage.c b/gtk/gtkborderimage.c
index bfd050aef65cb4afb9513f4149e27031562e96a0..47e6ad89e0f487fbc4b23b91e1ebd47d9f333f4a 100644 (file)
--- a/gtk/gtkborderimage.c
+++ b/gtk/gtkborderimage.c
@@ -195,20 +195,19 @@ _gtk_border_image_unpack (const GValue *value,
 void
 _gtk_border_image_pack (GValue             *value,
                         GtkStyleProperties *props,
-                        GtkStateFlags       state,
-                       GtkStylePropertyContext *context)
+                        GtkStateFlags       state)
 {
   GtkBorderImage *image;
   cairo_pattern_t *source;
   GtkBorder *slice, *width;
   GtkCssBorderImageRepeat *repeat;
 
-  _gtk_style_properties_get (props, state, context,
-                            "border-image-source", &source,
-                            "border-image-slice", &slice,
-                            "border-image-repeat", &repeat,
-                            "border-image-width", &width,
-                            NULL);
+  gtk_style_properties_get (props, state,
+                           "border-image-source", &source,
+                           "border-image-slice", &slice,
+                           "border-image-repeat", &repeat,
+                           "border-image-width", &width,
+                           NULL);
 
   if (source == NULL)
     {

diff --git a/gtk/gtkborderimageprivate.h b/gtk/gtkborderimageprivate.h
index ee4975f26375fbdb3d900900069a326171fecfdf..e228f0d4a2f3fdeb2be554b036a3c9ecef8ad0ed 100644 (file)
--- a/gtk/gtkborderimageprivate.h
+++ b/gtk/gtkborderimageprivate.h
@@ -64,8 +64,7 @@ GParameter *      _gtk_border_image_unpack           (const GValue         *valu
                                                       guint                *n_params);
 void              _gtk_border_image_pack             (GValue               *value,
                                                       GtkStyleProperties   *props,
-                                                      GtkStateFlags         state,
-                                                     GtkStylePropertyContext *context);
+                                                      GtkStateFlags         state);
 
 G_END_DECLS
 

diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c
index d5a9005944dbfab42fa067aa1c95ec29e0488c5f..7352788122cbe58608ecd592d103a45df01dc06e 100644 (file)
--- a/gtk/gtkcssshorthandproperty.c
+++ b/gtk/gtkcssshorthandproperty.c
@@ -88,7 +88,6 @@ static void
 _gtk_css_shorthand_property_query (GtkStyleProperty   *property,
                                    GtkStyleProperties *props,
                                    GtkStateFlags       state,
-                                  GtkStylePropertyContext *context,
                                    GValue             *value)
 {
   property->pack_func (value, props, state);

diff --git a/gtk/gtkcssstyleproperty.c b/gtk/gtkcssstyleproperty.c
index 03418ddbd682561bc91afaabaf84683b0b745162..47918572434cd56d5abb7b2dcf8feaf616282b48 100644 (file)
--- a/gtk/gtkcssstyleproperty.c
+++ b/gtk/gtkcssstyleproperty.c
@@ -125,7 +125,6 @@ static void
 _gtk_css_style_property_query (GtkStyleProperty   *property,
                                GtkStyleProperties *props,
                                GtkStateFlags       state,
-                              GtkStylePropertyContext *context,
                                GValue             *value)
 {
   const GValue *val;

diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c
index 781ac44c047e4e9fcf1a3166a618bd30ce13f191..c7e36aa024ddf5110faf1227669a8e6e2c8c2433 100644 (file)
--- a/gtk/gtkstyleproperties.c
+++ b/gtk/gtkstyleproperties.c
@@ -653,7 +653,7 @@ _gtk_style_properties_get_property (GtkStyleProperties *props,
       return FALSE;
     }
 
-  _gtk_style_property_query (node, props, state, context, value);
+  _gtk_style_property_query (node, props, state, value);
   return TRUE;
 }
 

diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 2a53cfd00eaee83f394f612fde4202c276234cc9..a8197842d78bd55a3138fc6db99573ba3f244bfa 100644 (file)
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -211,21 +211,19 @@ void
 _gtk_style_property_query (GtkStyleProperty        *property,
                            GtkStyleProperties      *props,
                            GtkStateFlags            state,
-                          GtkStylePropertyContext *context,
                            GValue                  *value)
 {
   GtkStylePropertyClass *klass;
 
   g_return_if_fail (property != NULL);
   g_return_if_fail (GTK_IS_STYLE_PROPERTIES (props));
-  g_return_if_fail (context != NULL);
   g_return_if_fail (value != NULL);
 
   klass = GTK_STYLE_PROPERTY_GET_CLASS (property);
 
   g_value_init (value, property->value_type);
 
-  klass->query (property, props, state, context, value);
+  klass->query (property, props, state, value);
 }
 
 static void

diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 3d72facc809511379652886161461438aa970e2f..7e97b70fb0af3a845efca73ae75ca66e2c519a35 100644 (file)
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -67,7 +67,6 @@ struct _GtkStylePropertyClass
   void              (* query)                              (GtkStyleProperty       *property,
                                                             GtkStyleProperties     *props,
                                                             GtkStateFlags           state,
-                                                           GtkStylePropertyContext *context,
                                                             GValue                 *value);
   gboolean          (* parse_value)                        (GtkStyleProperty *      property,
                                                             GValue                 *value,
@@ -92,7 +91,6 @@ GType                    _gtk_style_property_get_value_type(GtkStyleProperty *
 void                     _gtk_style_property_query         (GtkStyleProperty *      property,
                                                             GtkStyleProperties     *props,
                                                             GtkStateFlags           state,
-                                                           GtkStylePropertyContext *context,
                                                             GValue                 *value);
 void                     _gtk_style_property_assign        (GtkStyleProperty       *property,
                                                             GtkStyleProperties     *props,